Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 23 Aug 2010 22:45:50 +0000 (22:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 23 Aug 2010 22:45:50 +0000 (22:45 +0000)

Trivial merge